build: Yield 'man' option to extension-tool subproject

Turns out meson has a build-in pattern of what we are doing, namely:
Set a subproject option to a parent project option of the same name.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1072

diff --git a/meson.build b/meson.build
index 680b189e0bf81c1430b4379a52c26a96793bb6a9..f9e178673a3cd2731078d926607c57dc4f5ba677 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -246,7 +246,6 @@ libgvc_gir = libgvc.get_variable('libgvc_gir')
 if get_option('extensions_tool')
   extension_tool = subproject('extensions-tool',
     default_options: [
-      'man=@0@'.format(get_option('man')),
       'package_name=@0@'.format(meson.project_name()),
     ]
   )

diff --git a/subprojects/extensions-tool/meson_options.txt b/subprojects/extensions-tool/meson_options.txt
index 2b7aef6b6e8b1551d88dd4b985393215a99b6e36..d106bf889608a009f0aa425cb9c0807df6894041 100644 (file)
--- a/subprojects/extensions-tool/meson_options.txt
+++ b/subprojects/extensions-tool/meson_options.txt
@@ -1,7 +1,8 @@
 option('man',
   type: 'boolean',
   value: true,
-  description: 'Generate man pages'
+  description: 'Generate man pages',
+  yield: true,
 )
 
 option('package_name',